changelog: document fix cherry pick

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>

diff --git a/debian/changelog b/debian/changelog
index e12c1c2ee4cd7484cf8031c0abd619d4eff9e4eb..7e4096b3e16f1b1f102655046c7dbb93a2bf5db8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,9 @@ xen (4.8.0-1~) unstable; urgency=high
   * Change my own email address to my work (Citrix) address.  When
     uploading, I will swap hats to effectively sponsor my own upload.
 
+  * Cherry pick a build failure fix:
+      "x86/emul: add likely()/unlikely() to test harness"
+
   [ Ian Campbell ]
   * Start a qemu process in dom0 to service the toolstacks loopback disk
     attaches. (Closes: #770456)

diff --git a/debian/control.md5sum b/debian/control.md5sum
index d30740a33b46c708cf96bf2aa90e5c960d7263f4..1bb5c69fbb305c3af5b4a1288e43da9772abb52a 100644 (file)
--- a/debian/control.md5sum
+++ b/debian/control.md5sum
@@ -1,4 +1,4 @@
-12b01f357e9d4311d12ac9e6ec28c42f  debian/changelog
+7ee2f2461f92ce180c488b8c2294bc76  debian/changelog
 dc7b5d9f0538e3180af4e9aff9b0bd57  debian/bin/gencontrol.py
 20e336dbea44b1641802eff0dde9569b  debian/templates/control.main.in
 a15fa64ce6deead28d33c1581b14dba7  debian/templates/xen-hypervisor.postinst.in